f423aa
@@ -534,7 +534,7 @@
public abstract class AbstractDataSourceService implements Service<DataSource> {
         @Override
         protected ManagedConnectionFactory createMcf(XaDataSource arg0, String arg1, ClassLoader arg2)
                 throws NotFoundException, DeployException {
-            final WildFlyXaMCF xaManagedConnectionFactory = new WildFlyXaMCF();
+            final XAManagedConnectionFactory xaManagedConnectionFactory = new XAManagedConnectionFactory(xaDataSourceConfig.getXaDataSourceProperty());
 
             if (xaDataSourceConfig.getUrlDelimiter() != null) {
                 xaManagedConnectionFactory.setURLDelimiter(xaDataSourceConfig.getUrlDelimiter());
@@ -542,9 +542,6 @@
public abstract class AbstractDataSourceService implements Service<DataSource> {
             if (xaDataSourceConfig.getXaDataSourceClass() != null) {
                 xaManagedConnectionFactory.setXADataSourceClass(xaDataSourceConfig.getXaDataSourceClass());
             }
-            if (xaDataSourceConfig.getXaDataSourceProperty() != null) {
-                xaManagedConnectionFactory.setXaProps(xaDataSourceConfig.getXaDataSourceProperty());
-            }
             if (xaDataSourceConfig.getUrlSelectorStrategyClassName() != null) {
                 xaManagedConnectionFactory
                         .setUrlSelectorStrategyClassName(xaDataSourceConfig.getUrlSelectorStrategyClassName());
@@ -729,14 +726,5 @@
public abstract class AbstractDataSourceService implements Service<DataSource> {
 
     }
 
-    private class WildFlyXaMCF extends XAManagedConnectionFactory {
-
-        private static final long serialVersionUID = 4876371551002746953L;
-
-        public void setXaProps(Map<String, String> inputProperties) {
-            xaProps.putAll(inputProperties);
-        }
-
-    }
 
 }
